Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 7 Nov 2011 00:04:15 +0000 (16:04 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 7 Nov 2011 00:04:15 +0000 (16:04 -0800)
commita38eb754e5d88aa2a2bdc12488af680aec69cad8
tree954d995cc8be2ff7c3638e5d9a1039fc57f76402
parente1d9788f3aee4c4fe5969327822972f09211417a
parentfa5ffc939d1672abb90ede619e152e780ead361f
Merge from trunk.